Merge commit 'b84b3e16be5ad35a4cca82e975380c1c1585b4aa' of sso://googleplex-android/platform/external/bsdiff into HEAD Change-Id: Id05fefb3753b4a0d854327ae9fa255c792dc449a